Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc .gitignore
Simple merge

diff --cc .gitlab-ci.yml
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc configure.ac
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lib/Makefile.in
Simple merge

diff --cc lisp/Makefile.in
Simple merge

diff --cc lisp/cus-dep.el
Simple merge

diff --cc lisp/emacs-lisp/advice.el
Simple merge

diff --cc lisp/emacs-lisp/autoload.el
Simple merge

diff --cc lisp/emacs-lisp/byte-run.el
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/emacs-lisp/disass.el
Simple merge

diff --cc lisp/emacs-lisp/find-func.el
Simple merge

diff --cc lisp/emacs-lisp/nadvice.el
Simple merge

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/gnus/gnus.el
Simple merge

diff --cc lisp/help-fns.el
Simple merge

diff --cc lisp/help.el
Simple merge

diff --cc lisp/international/mule.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/mail/emacsbug.el
Simple merge

diff --cc lisp/progmodes/cc-bytecomp.el
Simple merge

diff --cc lisp/progmodes/cc-langs.el
Simple merge

diff --cc lisp/progmodes/elisp-mode.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/term/w32-win.el
Simple merge

diff --cc nt/epaths.nt
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/decompress.c
Simple merge

diff --cc src/doc.c
Simple merge

diff --cc src/dynlib.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/epaths.in
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/pdumper.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/w32.c
Simple merge

diff --cc src/w32common.h
Simple merge

diff --cc test/Makefile.in
Simple merge

diff --cc test/lisp/auth-source-tests.el
Simple merge

diff --cc test/lisp/help-fns-tests.el
Simple merge

diff --cc test/lisp/subr-tests.el
Simple merge